Add dotenv-rails
Merge with Master