diff --git a/.editorconfig b/.editorconfig
index fbcea2e..2fe4874 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,23 +11,23 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.js]
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.hbs]
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.css]
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.html]
 indent_style = space
-indent_size = 4
+indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false
diff --git a/README.md b/README.md
index d60ae1c..8da80df 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-Ember CLI version: **0.1.4**
+Ember CLI version: **0.1.5**
 
 NPM package name: **sl-ember-store**
 
diff --git a/bower.json b/bower.json
index 0d5e6c6..9332ae6 100755
--- a/bower.json
+++ b/bower.json
@@ -4,7 +4,7 @@
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
     "ember": "1.8.1",
-    "ember-resolver": "~0.1.10",
+    "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",
diff --git a/package.json b/package.json
index 2d75663..1e56832 100755
--- a/package.json
+++ b/package.json
@@ -22,12 +22,12 @@
   },
   "devDependencies": {
     "body-parser": "~1.9.3",
-    "broccoli-asset-rev": "^1.0.0",
+    "broccoli-asset-rev": "^2.0.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
     "broccoli-static-compiler": "~0.2.1",
     "connect-restreamer": "^1.0.1",
-    "ember-cli": "0.1.4",
-    "ember-cli-dependency-checker": "0.0.6",
+    "ember-cli": "0.1.5",
+    "ember-cli-dependency-checker": "0.0.7",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-pretender": "^0.3.1",
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index d3f169f..c59bcd5 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -21,10 +21,10 @@ 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') {
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index e087e48..16cc7c3 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -4,16 +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;
 
   Ember.run(function() {
-    App = Application.create(attributes);
-    App.setupForTesting();
-    App.injectTestHelpers();
+    application = Application.create(attributes);
+    application.setupForTesting();
+    application.injectTestHelpers();
   });
 
-  return App;
+  return application;
 }