Changed to postgres and other preparation for heroku deployment