setup pg for heroku
Merge branch 'develop'