Add rails 12 factor gem for heroku
Heroku fix
Fix conflicts