added conditional for displaying show map button
took out feed expanding
removed expander and scoped runs in index
fixed merge conflicts
edits
bump:
bump
updated README.rdoc
Merge branch 'master' of github.com:bradpsheehan/feed_engine
changed README from rdoc to markdown
bump
Merge branch 'master' of github.com:bradpsheehan/feed_engine
bump
bump
working on tweets
fixed merge conflicts
address merge conflicts, twitter auth issue pending
Merge branch 'master' of github.com:bradpsheehan/feed_engine
changed profile page to have both apps when not connected to either
Merge branch 'master' of github.com:bradpsheehan/feed_engine into homestrech_styling