Tidy gemfile and add 'pg' and 12 factor for heroku