Changes for Heroku and bundle install