Make sure config uses the current Rails.env
Merge branch 'fix-railtie'