added conditional for displaying show map button
took out feed expanding
removed expander and scoped runs in index
fixed merge conflicts
updated README.rdoc
Merge branch 'master' of github.com:bradpsheehan/feed_engine