Update of README.md for BarCamp 2014
Revert "Merge branch 'master' into heroku_merge"

This reverts commit 79c84bf2b430fbdd351dafedd6d966fc22fedb6b, reversing
changes made to b2933414157dc15dc1e5f35abf2a8a383a4d4beb.
Merge remote-tracking branch 'origin/dev'
Ugly corrections between Github and Heroku repos.