Fixed bugged related to friend requests
Added basic feed friends functionality
 resolve a merge, ensure follower and followed are passed correctly to find a friend connection.
Merge pull request #16 from tiger-swallowtails-2013/feeds

Feeds