Cherrypick Gemfile changes for production deployment with postgres
Add better_errors gem
Use latest version of my patches
Merge branch 'master' into heroku

Conflicts:
	Gemfile
Test with ruby 2.0.0 in production