diff --git a/.watchmanconfig b/.watchmanconfig
new file mode 100644
index 000000000..5e9462c20
--- /dev/null
+++ b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}
diff --git a/app/initializers/authentication.js b/app/instance-initializers/authentication.js
similarity index 57%
rename from app/initializers/authentication.js
rename to app/instance-initializers/authentication.js
index fe014b319..9c7bd2d09 100644
--- a/app/initializers/authentication.js
+++ b/app/instance-initializers/authentication.js
@@ -1,16 +1,16 @@
 import Ember from 'ember';
-import Session from 'simple-auth/session';
-import OAuth2 from 'simple-auth-oauth2/authenticators/oauth2';
 
 var AuthenticationInitializer = {
     name: 'authentication',
-    before: 'simple-auth',
-    after: 'registerTrailingLocationHistory',
 
-    initialize: function (container) {
+    initialize: function (instance) {
+        var store = instance.container.lookup('store:main'),
+            Session = instance.container.lookup('simple-auth-session:main'),
+            OAuth2 = instance.container.lookup('simple-auth-authenticator:oauth2-password-grant');
+
         Session.reopen({
             user: Ember.computed(function () {
-                return container.lookup('store:main').find('user', 'me');
+                return store.find('user', 'me');
             })
         });
 
diff --git a/bower.json b/bower.json
index 3e6fd93fe..0d432d222 100644
--- a/bower.json
+++ b/bower.json
@@ -8,8 +8,8 @@
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "0.1.3",
     "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
     "ember-mocha": "0.7.0",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
     "ember-resolver": "0.1.15",
     "ember-simple-auth": "0.8.0-beta.2",
     "fastclick": "1.0.6",
diff --git a/lib/asset-delivery/index.js b/lib/asset-delivery/index.js
index efd250f95..d24f55a34 100644
--- a/lib/asset-delivery/index.js
+++ b/lib/asset-delivery/index.js
@@ -1,9 +1,16 @@
-    module.exports = {
-        name: 'asset-delivery',
-        postBuild: function (results) {
-            var fs = this.project.require('fs-extra');
+module.exports = {
+    name: 'asset-delivery',
+    postBuild: function (results) {
+        var fs = this.project.require('fs-extra'),
+            cpd = this.project.require('ember-cli-copy-dereference'),
+            templateOut = '../server/views/default.hbs',
+            assetsOut = '../built/assets';
 
-            fs.copySync(results.directory + '/index.html', '../server/views/default.hbs');
-            fs.copySync('./dist/assets', '../built/assets');
-        }
-    };
+        fs.removeSync(templateOut);
+        fs.removeSync(assetsOut);
+        fs.ensureDirSync(assetsOut);
+
+        cpd.sync(results.directory + '/index.html', templateOut);
+        cpd.sync(results.directory + '/assets', assetsOut);
+    }
+};
diff --git a/package.json b/package.json
index dd6e40998..fad370193 100644
--- a/package.json
+++ b/package.json
@@ -20,19 +20,20 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.2",
+    "ember-cli": "0.2.7",
     "ember-cli-app-version": "0.3.3",
-    "ember-cli-babel": "^4.1.0",
+    "ember-cli-babel": "^5.0.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "0.0.8",
+    "ember-cli-copy-dereference": "1.0.0",
+    "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-fastclick": "1.0.3",
-    "ember-cli-htmlbars": "^0.7.4",
+    "ember-cli-htmlbars": "0.7.6",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-mocha": "^0.7.0",
     "ember-cli-simple-auth": "0.8.0-beta.2",
     "ember-cli-simple-auth-oauth2": "0.8.0-beta.2",
-    "ember-cli-uglify": "1.0.1",
+    "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.0.0-beta.18",
     "ember-export-application-global": "^1.0.2",
     "ember-myth": "0.0.2",