merging master
removes conflicting routes
adds activities
adds routes back in
adds activity feeds and hop show pages
Merge pull request #12 from adamzaninovich/feeds

Feeds