[Merge] lp:~robru/friends/simplify-contacts into lp:friends

[Robert Bruce Park]

Review: Approve

Ok, I'm pretty happy with this at this point. A lot of mysterious methods are gone, test coverage is good, and the major inefficiencies have been streamlined. If you could review this on Monday, Ken, that'd be super.
-- 
https://code.launchpad.net/~robru/friends/simplify-contacts/+merge/175968
Your team Super Friends is subscribed to branch lp:friends.