greater focus on Heroku button for deploys
typo
link to info about Heroku button
Merge branch 'master' of github.com:openplans/shareabouts
Resolved remaining merge conflict.