Ensure window.EmberENV uses the EmberENV key from config/environment.js.
Merge pull request #2057 from rwjblue/use-ember-env-properly

Ensure window.EmberENV uses the EmberENV key from config/environment.js.