Merge branch 'master' of https://github.com/tyrbo/tunefish
Merge branch 'master' of https://github.com/tyrbo/tunefish
Merge branch 'master' of https://github.com/tyrbo/tunefish
Remove percentage related specs from rails
Remove pry
Change filters from checkboxes to clickable p elements
user show page has appropriate styling and follow button
user show page shows activity feed
Merge branch 'master' of https://github.com/tyrbo/tunefish into user_show_page
Merge pull request #34 from allisonlarson/user_show_page

User show page
Change how the activity filters behave

We used to have checkboxes, now it's a p element that has colored text
toggled on/off based on what is filtered.
Styles on left pane
Fix merge conflict
Working on Rakefile deployments
Modified Rakefile so that it ensures rails-starter starts properly.
Merge pull request #37 from wfro/fix-master

Styles on the left pane and clean up.
feed content bar is functional
Merge branch 'master' of https://github.com/tyrbo/tunefish into user_show_page
Added Status API endpoint for CoreOS discovery service
merge upstream master