diff --git a/bower.json b/bower.json
index e0919a9a..48e1ea72 100644
--- a/bower.json
+++ b/bower.json
@@ -3,7 +3,6 @@
   "version": "0.1.2",
   "dependencies": {
     "ember": "^1.4.0",
-    "handlebars": "^1.3.0",
     "c3": ">=0.1.43-0 < 1.0.0-0"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
index 97aa69a6..dfd1a80d 100644
--- a/package.json
+++ b/package.json
@@ -8,32 +8,34 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "connect-livereload": "~0.2.0",
+    "ember-template-compiler": "^1.9.0-alpha",
     "grunt": "~0.4.1",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-concat": "~0.3.0",
+    "grunt-concurrent": "~0.3.0",
+    "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-uglify": "~0.2.0",
     "grunt-contrib-compass": "~0.5.0",
-    "grunt-contrib-jshint": "~0.6.3",
-    "grunt-contrib-cssmin": "~0.6.0",
+    "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-connect": "~0.3.0",
-    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-cssmin": "~0.6.0",
     "grunt-contrib-htmlmin": "~0.1.3",
     "grunt-contrib-imagemin": "~0.2.0",
+    "grunt-contrib-jshint": "~0.6.3",
+    "grunt-contrib-uglify": "~0.2.0",
     "grunt-contrib-watch": "~0.5.2",
-    "grunt-rev": "~0.1.0",
-    "grunt-usemin": "~0.1.12",
+    "grunt-ember-templates": "^0.5.0-alpha",
     "grunt-mocha": "~0.4.1",
+    "grunt-neuter": "~0.5.0",
     "grunt-open": "~0.2.0",
-    "grunt-svgmin": "~0.2.0",
-    "grunt-concurrent": "~0.3.0",
-    "load-grunt-tasks": "~0.1.0",
-    "connect-livereload": "~0.2.0",
-    "grunt-ember-templates": "0.4.14",
-    "time-grunt": "~0.1.1",
     "grunt-replace": "~0.4.4",
+    "grunt-rev": "~0.1.0",
+    "grunt-svgmin": "~0.2.0",
+    "grunt-usemin": "~0.1.12",
+    "handlebars": "^2.0.0",
     "jshint-stylish": "~0.1.3",
-    "grunt-neuter": "~0.5.0"
+    "load-grunt-tasks": "~0.1.0",
+    "time-grunt": "~0.1.1"
   },
   "engines": {
     "node": ">=0.8.0"