Add rails_12factor gem so that heroku can serve static assets
Merge some changes with the Gemfile.lock