diff --git a/.editorconfig b/.editorconfig
index 5d5dea4..2fe4874 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -29,5 +29,5 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
index 58c65e0..8b62a6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@
 /.sass-cache
 /connect.lock
 /coverage/*
-/site
 /libpeerconnection.log
 npm-debug.log
 testem.log
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/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..b6c71bd
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2014
+
+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 ba88d39..145f9a2 100644
--- a/bower.json
+++ b/bower.json
@@ -5,7 +5,7 @@
     "jquery": "^1.11.1",
     "ember": "1.8.1",
     "ember-data": "1.0.0-beta.12",
-    "ember-resolver": "~0.1.7",
+    "ember-resolver": "~0.1.11",
     "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",
@@ -13,7 +13,7 @@
     "ember-qunit": "0.1.8",
     "ember-qunit-notifications": "0.0.4",
     "qunit": "~1.15.0",
-    "sinon": "http://sinonjs.org/releases/sinon-1.11.1.js",
-    "pretender": "0.1.0"
+    "sinon": "http://sinonjs.org/releases/sinon-1.12.1.js",
+    "pretender": "~0.4.2"
   }
 }
diff --git a/docs/index.md b/docs/index.md
index b9eae10..012b15c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,7 +12,8 @@ designed to work with Django REST Framework.
 To build a project using Ember Django Adapter, you will need to be using:
 
 * Django REST Framwork >= 3.0
-* Ember CLI >= 0.1.0
+* Ember Data >= 1.0.0-beta.12
+* Ember CLI >= 0.1.5
 
 
 ## Quickstart
diff --git a/index.js b/index.js
index cd8d0f3..5e64155 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 6115d47..0892a43 100644
--- a/package.json
+++ b/package.json
@@ -18,15 +18,16 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.3.1",
+    "broccoli-asset-rev": "^2.0.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.1.2",
+    "ember-cli": "0.1.5",
     "ember-cli-content-security-policy": "0.3.0",
+    "ember-cli-dependency-checker": "0.0.7",
+    "ember-cli-esnext": "0.1.1",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-pretender": "^0.3.1",
-    "ember-cli-qunit": "0.1.0",
+    "ember-cli-qunit": "0.1.2",
     "ember-data": "1.0.0-beta.12",
     "ember-export-application-global": "^1.0.0",
     "ember-sinon": "0.0.2",
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
index b7d8600..1c49d36 100644
--- a/tests/dummy/app/index.html
+++ b/tests/dummy/app/index.html
@@ -11,11 +11,15 @@
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
+
+    {{content-for 'head-footer'}}
   </head>
   <body>
     {{content-for 'body'}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
+
+    {{content-for 'body-footer'}}
   </body>
 </html>
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
index d08c11f..05eb936 100644
--- a/tests/dummy/app/templates/application.hbs
+++ b/tests/dummy/app/templates/application.hbs
@@ -1,3 +1,3 @@
-<h2 id='title'>Welcome to Ember.js</h2>
+<h2 id="title">Welcome to Ember.js</h2>
 
 {{outlet}}
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index 7546852..6222419 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -14,6 +14,9 @@ module.exports = function(environment) {
     },
 
     APP: {
+      // Here you can pass flags/options to your application instance
+      // when it is created
+
       // The integration tests don't work with the API_HOST setting set
       // because Pretender doesn't work when a host set.
       API_HOST: '',
@@ -23,16 +26,16 @@ 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') {
     // 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..16cc7c3 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -4,22 +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;
 
-  Router.reopen({
-    location: 'none'
-  });
-
   Ember.run(function() {
-    App = Application.create(attributes);
-    App.setupForTesting();
-    App.injectTestHelpers();
+    application = Application.create(attributes);
+    application.setupForTesting();
+    application.injectTestHelpers();
   });
 
-  App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"
-
-  return App;
+  return application;
 }
diff --git a/tests/index.html b/tests/index.html
index 85990e1..4112b61 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -29,10 +29,11 @@
         zoom: 50%;
       }
     </style>
+
+    {{content-for 'head-footer'}}
+    {{content-for 'test-head-footer'}}
   </head>
   <body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
 
     {{content-for 'body'}}
     {{content-for 'test-body'}}
@@ -41,5 +42,8 @@
     <script src="assets/dummy.js"></script>
     <script src="testem.js"></script>
     <script src="assets/test-loader.js"></script>
+
+    {{content-for 'body-footer'}}
+    {{content-for 'test-body-footer'}}
   </body>
 </html>