Added gemfile.lock for heroku push
Removed gemfile.lock again to avoid problems with travis