Added rails_12factor gem and updated Gemfile.lock
merging to master for heroku