The scheme of DATABASE_URL for postgresql is "postgres"
Merge branch 'master' into heroku