Not that pg really helps when we're using MySQL anyway...
Noted DATABASE_URL config
Merge branch 'master' into production
mysql => mysql2
Merge branch 'master' into production