diff --git a/.watchmanconfig b/.watchmanconfig
new file mode 100644
index 00000000..e7834e3e
--- /dev/null
+++ b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}
diff --git a/bower.json b/bower.json
index ca6fd06e..8aa3f50d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,23 +1,22 @@
 {
   "name": "travis",
   "dependencies": {
-    "handlebars": "2.0.0",
+    "ember": "1.13.10",
+    "ember-cli-shims": "0.0.6",
+    "ember-cli-test-loader": "0.2.1",
+    "ember-data": "1.13.15",
+    "ember-load-initializers": "0.1.7",
+    "ember-qunit": "0.4.16",
+    "ember-qunit-notifications": "0.1.0",
     "jquery": "^1.11.3",
-    "ember": "1.13.8",
-    "ember-data": "1.13.9",
-    "ember-resolver": "~0.1.15",
     "loader.js": "ember-cli/loader.js#3.2.1",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.5",
-    "qunit": "~1.18.0",
+    "qunit": "~1.20.0",
     "visibilityjs": "~1.2.1",
     "JavaScript-MD5": "~1.1.0",
     "moment": "~2.9.0",
     "jquery-timeago": "~1.4.1",
     "pusher": "~2.2.3",
-    "pretender": "0.1.0"
+    "pretender": "0.1.0",
+    "ember-resolver": "~0.1.20"
   }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 620c6457..47b319e8 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 /* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
diff --git a/package.json b/package.json
index 55c88689..325eed46 100644
--- a/package.json
+++ b/package.json
@@ -19,29 +19,31 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.1.2",
+    "broccoli-asset-rev": "^2.2.0",
     "broccoli-sass": "0.6.6",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
+    "ember-cli": "1.13.12",
+    "ember-cli-app-version": "^1.0.0",
     "ember-cli-autoprefixer": "^0.3.0",
-    "ember-cli-babel": "5.1.3",
+    "ember-cli-babel": "5.1.5",
     "ember-cli-coffeescript": "0.10.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "1.0.1",
-    "ember-cli-document-title": "0.1.0",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
-    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-document-title": "0.2.0",
+    "ember-cli-htmlbars": "1.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-inline-images": "^0.0.4",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-qunit": "1.0.0",
-    "ember-cli-sri": "^1.0.3",
-    "ember-cli-release": "0.2.3",
+    "ember-cli-qunit": "^1.0.4",
+    "ember-cli-sri": "^1.1.0",
+    "ember-cli-release": "0.2.8",
     "ember-cli-sauce": "^1.1.0",
     "ember-cli-uglify": "1.2.0",
-    "ember-data": "1.13.9",
+    "ember-data": "1.13.15",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.7"
+    "ember-try": "0.0.7",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.4"
   }
 }
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
new file mode 100644
index 00000000..c3d4d1ab
--- /dev/null
+++ b/tests/helpers/destroy-app.js
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
new file mode 100644
index 00000000..ed23003d
--- /dev/null
+++ b/tests/helpers/module-for-acceptance.js
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      destroyApp(this.application);
+
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+    }
+  });
+}
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
index 28f4ece4..ebfb4e4d 100644
--- a/tests/helpers/resolver.js
+++ b/tests/helpers/resolver.js
@@ -1,7 +1,7 @@
 import Resolver from 'ember/resolver';
 import config from '../../config/environment';
 
-var resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index e06c4970..cc193013 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -3,9 +3,9 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var application;
+  let application;
 
-  var attributes = Ember.merge({}, config.APP);
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Ember.run(function() {
diff --git a/tests/index.html b/tests/index.html
index 620273fb..f1301f10 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -34,6 +34,7 @@
     <script src="assets/test-support.js"></script>
     <script src="assets/travis.js"></script>
     <script src="testem.js"></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
     {{content-for 'body-footer'}}