diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..08096ef
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,32 @@
+{
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "devel": true,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": false,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": false,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": false,
+  "eqnull": true,
+  "esnext": true,
+  "unused": 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/bower.json b/bower.json
index 4e965f6..6b69839 100755
--- a/bower.json
+++ b/bower.json
@@ -3,8 +3,8 @@
   "dependencies": {
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.7.0",
-    "ember-resolver": "~0.1.7",
+    "ember": "1.8.1",
+    "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 463bd41..e4231d3 100755
--- 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 d112d62..cd2a72e 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,9 @@
 {
   "name": "sl-ember-model",
-  "version": "0.1.0",
-  "description": "Ember CLI Addon - Data Model",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
   "scripts": {
     "start": "ember server",
     "build": "ember build",
@@ -14,37 +16,38 @@
   "engines": {
     "node": ">= 0.10.0"
   },
-  "keywords": [
-    "ember-addon",
-    "model",
-    "data"
-  ],
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  },
-  "authors": [
-    "Matthew Marcum <mmarcum@softlayer.com>",
-    "Jeremy Brown <jebrown@softlayer.com>",
-    "Ryan Edgell <redgell@softlayer.com>"
-  ],
   "license": "MIT",
   "dependencies": {
     "sl-ember-modelize": "~1.0.0"
   },
   "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",
-    "broccoli-static-compiler": "^0.2.0",
-    "ember-cli": "0.1.2",
+    "ember-cli": "0.1.3",
     "ember-cli-content-security-policy": "0.3.0",
+    "ember-cli-dependency-checker": "0.0.6",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
+    "ember-cli-qunit": "0.1.2",
     "ember-cli-pretender": "^0.3.1",
-    "ember-cli-qunit": "0.1.0",
     "ember-export-application-global": "^1.0.0",
     "express": "^4.8.5",
-    "glob": "^4.0.5",
-    "connect-restreamer": "~1.0.1"
+    "glob": "^4.0.5"
+  },
+  "ember-addon": {
+    "configPath": "tests/dummy/config"
+  },
+  "authors": [
+    "Matthew Marcum <mmarcum@softlayer.com>",
+    "Jeremy Brown <jebrown@softlayer.com>",
+    "Ryan Edgell <redgell@softlayer.com>"
+  ],
+  "keywords": [
+    "ember-addon",
+    "model",
+    "data"
+  ],
+  "ember-addon": {
+    "configPath": "tests/dummy/config"
   }
-}
+ }
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 2cc81fe..600b50c 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'}}