Updated to sync with latest Ember App Kit