diff --git a/tests/dummy/.jshintrc b/.jshintrc
similarity index 92%
rename from tests/dummy/.jshintrc
rename to .jshintrc
index fbcc848..08096ef 100644
--- a/tests/dummy/.jshintrc
+++ b/.jshintrc
@@ -4,8 +4,8 @@
     "window",
     "-Promise"
   ],
-  "browser" : true,
-  "boss" : true,
+  "browser": true,
+  "boss": true,
   "curly": true,
   "debug": false,
   "devel": true,
diff --git a/.travis.yml b/.travis.yml
index df6253d..cf23938 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ cache:
   directories:
     - node_modules
 
+before_install:
+  - "npm config set spin false"
+  - "npm install -g npm@^2"
+
 install:
   - npm install -g bower
   - npm install
diff --git a/Brocfile.js b/Brocfile.js
index 8c25bfe..042a64d 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -1,3 +1,4 @@
+/* jshint node: true */
 /* global require, module */
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..00e9fbb
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2015
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/bower.json b/bower.json
index 06fcb30..af6b315 100644
--- a/bower.json
+++ b/bower.json
@@ -3,9 +3,9 @@
   "dependencies": {
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.7.0",
-    "ember-data": "1.0.0-beta.10",
-    "ember-resolver": "~0.1.7",
+    "ember": "1.8.1",
+    "ember-data": "1.0.0-beta.11",
+    "ember-resolver": "~0.1.10",
     "loader.js": "stefanpenner/loader.js#1.0.1",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
diff --git a/index.js b/index.js
index e1c4d9c..c1a8fe5 100644
--- a/index.js
+++ b/index.js
@@ -1,3 +1,4 @@
+/* jshint node: true */
 'use strict';
 
 module.exports = {
diff --git a/package.json b/package.json
index 5339377..cf2bfdc 100644
--- a/package.json
+++ b/package.json
@@ -10,26 +10,28 @@
     "build": "ember build",
     "test": "ember test"
   },
-  "repository": "https://github.com/stefanpenner/ember-cli",
+  "repository": "",
   "engines": {
     "node": ">= 0.10.0"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.3.1",
+    "broccoli-asset-rev": "^1.0.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.1.2",
+    "ember-cli": "0.1.3",
     "ember-cli-content-security-policy": "0.3.0",
-    "ember-export-application-global": "^1.0.0",
+    "ember-cli-dependency-checker": "0.0.6",
+    "ember-cli-esnext": "0.1.1",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.1.0",
-    "ember-data": "1.0.0-beta.10",
+    "ember-cli-qunit": "0.1.2",
+    "ember-data": "1.0.0-beta.11",
+    "ember-export-application-global": "^1.0.0",
     "express": "^4.8.5",
     "glob": "^4.0.5"
   },
+  "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
   ],
diff --git a/tests/dummy/app/styles/.gitkeep b/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/templates/.gitkeep b/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index bc0d538..d3f169f 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -30,7 +30,7 @@ module.exports = function(environment) {
   if (environment === 'test') {
     // Testem prefers this...
     ENV.baseURL = '/';
-    ENV.locationType = 'auto';
+    ENV.locationType = 'none';
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;
diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt
index ee2cc21..5debfa4 100644
--- a/tests/dummy/public/robots.txt
+++ b/tests/dummy/public/robots.txt
@@ -1,3 +1,2 @@
-# robotstxt.org/
-
+# http://www.robotstxt.org
 User-agent: *
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 7cd4320..e087e48 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -9,17 +9,11 @@ export default function startApp(attrs) {
   var attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Router.reopen({
-    location: 'none'
-  });
-
   Ember.run(function() {
     App = Application.create(attributes);
     App.setupForTesting();
     App.injectTestHelpers();
   });
 
-  App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"
-
   return App;
 }
diff --git a/tests/index.html b/tests/index.html
index 85990e1..12ade4a 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -31,8 +31,6 @@
     </style>
   </head>
   <body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
 
     {{content-for 'body'}}
     {{content-for 'test-body'}}