Heroku support.
Merge branch 'master' into deploy-to-heroku

Conflicts:
	Gemfile.lock
Merge branch 'master' into deploy-to-heroku
Point to the live application.
Merge branch 'deploy-to-heroku'