[Merge] lp:~andrewsomething/friends/instagram into lp:~super-friends/friends/trunk-next

[Robert Bruce Park]

Review: Approve

I've done the work of rebasing this on trunk, and I've resubmitted it myself here: https://code.launchpad.net/~robru/friends/instagram/+merge/173277

Thanks!
-- 
https://code.launchpad.net/~andrewsomething/friends/instagram/+merge/159211
Your team Super Friends is subscribed to branch lp:~super-friends/friends/trunk-next.