diff --git a/ember/.editorconfig b/ember/.editorconfig
index 5d5dea4cc..2fe4874a0 100644
--- a/ember/.editorconfig
+++ b/ember/.editorconfig
@@ -29,5 +29,5 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false
diff --git a/ember/bower.json b/ember/bower.json
index ac8959287..e3bb00512 100644
--- a/ember/bower.json
+++ b/ember/bower.json
@@ -5,11 +5,11 @@
     "jquery": "^1.11.1",
     "ember": "1.9.1",
     "ember-data": "1.0.0-beta.14",
-    "ember-resolver": "~0.1.10",
-    "loader.js": "stefanpenner/loader.js#1.0.1",
-    "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
+    "ember-resolver": "~0.1.11",
+    "loader.js": "ember-cli/loader.js#1.0.1",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
-    "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
     "ember-qunit": "0.1.8",
     "ember-qunit-notifications": "0.0.4",
     "qunit": "~1.15.0",
diff --git a/ember/config/environment.js b/ember/config/environment.js
index cf21aeeb9..3a276770c 100644
--- a/ember/config/environment.js
+++ b/ember/config/environment.js
@@ -21,10 +21,10 @@ module.exports = function(environment) {
 
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
-    ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_ACTIVE_GENERATION = true;
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
-    ENV.APP.LOG_VIEW_LOOKUPS = true;
+    // ENV.APP.LOG_VIEW_LOOKUPS = true;
   }
 
   if (environment === 'test') {
diff --git a/ember/package.json b/ember/package.json
index 12a82e42e..747a49126 100644
--- a/ember/package.json
+++ b/ember/package.json
@@ -18,22 +18,21 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^1.0.0",
-    "ember-cli": "0.1.4",
+    "broccoli-asset-rev": "^2.0.0",
+    "ember-cli": "0.1.7",
+    "ember-cli-6to5": "0.2.1",
     "ember-cli-content-security-policy": "0.3.0",
-    "ember-cli-dependency-checker": "0.0.6",
-    "ember-cli-esnext": "0.1.1",
-    "ember-cli-htmlbars": "^0.5.4",
+    "ember-cli-dependency-checker": "0.0.7",
+    "ember-cli-htmlbars": "^0.6.0",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-less": "^1.0.5",
     "ember-cli-qunit": "0.1.2",
-    "ember-data": "1.0.0-beta.12",
+    "ember-data": "1.0.0-beta.14",
     "ember-dynamic-component": "0.0.4",
     "ember-export-application-global": "^1.0.0",
     "ember-json-api": "^0.2.3",
     "express": "^4.8.5",
-    "glob": "^4.0.5",
-    "liquid-fire": "^0.16.0"
+    "glob": "^4.0.5"
   }
 }
diff --git a/ember/tests/helpers/start-app.js b/ember/tests/helpers/start-app.js
index e087e486b..16cc7c398 100644
--- a/ember/tests/helpers/start-app.js
+++ b/ember/tests/helpers/start-app.js
@@ -4,16 +4,16 @@ import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var App;
+  var application;
 
   var attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Ember.run(function() {
-    App = Application.create(attributes);
-    App.setupForTesting();
-    App.injectTestHelpers();
+    application = Application.create(attributes);
+    application.setupForTesting();
+    application.injectTestHelpers();
   });
 
-  return App;
+  return application;
 }