Add rails 12 factor gem
Merge with remote