diff --git a/.editorconfig b/.editorconfig
index 9b23950ce..32e8c9222 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,7 +16,7 @@ insert_final_newline = false
 [{package,bower}.json]
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false
 
 [*.yml]
diff --git a/bower.json b/bower.json
index 26a3ce904..fb28a1a88 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "ghost",
+  "name": "ghost-admin",
   "dependencies": {
     "devicejs": "0.2.7",
     "ember": "2.6.1",
diff --git a/package.json b/package.json
index c2c1883cb..6636dfb6b 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "codemirror": "5.18.2",
     "csscomb": "3.1.8",
     "ember-ajax": "ember-cli/ember-ajax#b32b9ee5ede69e09a162eb98d354f7de6297f679",
-    "ember-cli": "2.7.0",
+    "ember-cli": "2.8.0",
     "ember-cli-app-version": "2.0.0",
     "ember-cli-babel": "5.1.10",
     "ember-cli-content-security-policy": "0.5.0",