Use environment var for pg user
Cleanup for rails 4 and heroku