update Gemfile.lock for Heroku
roll back previous commit
Merge branch 'heroku-compatability'