Reset heroku master
more installs and updated Gemfile
fix conflicts