Update gemfile.lock for heroku
Add precompiled assets for heroku
Merge Gemfile