Switches to dotenv-rails
Merge branch 'master' into capistrano