removed gem pg from Gemfile that is only needed on heroku
Merge branch 'master' into development