Changes for heroku
Fix Gemfile.lock
Fixes pg setup
Fixes pg setup
merge fix