lost things, now following users puts activities in subscription feed
fix merge conflicts
Merge pull request #33 from allisonlarson/user_subs

User subs