updated database dependencies
adds to gemfile for heroku deployment
deploys heroku, reconciled merge conflicts in gemfile