diff --git a/.ember-cli b/.ember-cli
index ee64cfed2..59bb55fe9 100644
--- a/.ember-cli
+++ b/.ember-cli
@@ -5,5 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": true
 }
diff --git a/.gitignore b/.gitignore
index 5aac72ac9..bd3f0dca0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,4 @@ testem.log
 
 # built by grunt
 public/assets/img/contributors/
-templates/-contributors.hbs
+app/templates/-contributors.hbs
diff --git a/Brocfile.js b/Brocfile.js
index f9c0bf43b..e3abbf619 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -29,6 +29,7 @@ app.import('bower_components/ember-simple-auth/simple-auth.js');
 app.import('bower_components/ember-simple-auth/simple-auth-oauth2.js');
 app.import('bower_components/google-caja/html-css-sanitizer-bundle.js');
 app.import('bower_components/nanoscroller/bin/javascripts/jquery.nanoscroller.js');
+app.import('bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js');
 
 app.import('vendor/showdown/extensions/ghostgfm.js');
 app.import('vendor/showdown/extensions/ghostimagepreview.js');
diff --git a/app/config-dev.js b/app/config-dev.js
deleted file mode 100644
index 33da76efa..000000000
--- a/app/config-dev.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Ember from 'ember';
-function configureApp(App) {
-    if (!App instanceof Ember.Application) {
-        return;
-    }
-
-    App.reopen({
-        LOG_ACTIVE_GENERATION: true,
-        LOG_MODULE_RESOLVER: true,
-        LOG_TRANSITIONS: true,
-        LOG_TRANSITIONS_INTERNAL: true,
-        LOG_VIEW_LOOKUPS: true
-    });
-}
-
-export default configureApp;
diff --git a/app/config-prod.js b/app/config-prod.js
deleted file mode 100644
index e4f53d03e..000000000
--- a/app/config-prod.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Ember from 'ember';
-function configureApp(App) {
-    if (!App instanceof Ember.Application) {
-        return;
-    }
-}
-
-export default configureApp;
diff --git a/bower.json b/bower.json
index af11272c2..7960c41f4 100644
--- a/bower.json
+++ b/bower.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "codemirror": "4.0.1",
     "Countable": "2.0.2",
-    "handlebars": "~1.3.0",
+    "handlebars": "2.0.0",
     "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
     "ember": "1.10.0",
     "ember-data": "1.0.0-beta.14.1",
@@ -12,12 +12,12 @@
     "ember-simple-auth": "0.7.2",
     "fastclick": "1.0.0",
     "google-caja": "5669.0.0",
-    "handlebars": "2.0.0",
     "ic-ajax": "1.0.1",
-    "jquery": "^1.11.1",
+    "jquery": "~1.11.2",
     "jquery-file-upload": "9.5.6",
     "jquery-hammerjs": "1.0.1",
     "jquery-ui": "1.10.4",
+    "jqueryui-touch-punch": "furf/jquery-ui-touch-punch",
     "keymaster": "git://github.com/madrobby/keymaster#564ea42e07de40da8113a571f17ceae8802672ff",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "moment": "2.8.3",
@@ -30,9 +30,6 @@
   "devDependencies": {
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
-    "ember-mocha": "~0.3.0",
-    "ember-qunit": "0.2.8",
-    "ember-qunit-notifications": "0.0.7",
-    "qunit": "~1.17.1"
+    "ember-mocha": "~0.3.0"
   }
 }
diff --git a/package.json b/package.json
index 69b008c0b..fd3e8fb09 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
     "ember-cli-uglify": "1.0.1",
     "ember-data": "1.0.0-beta.14.1",
     "ember-export-application-global": "^1.0.2",
-    "express": "^4.8.5",
     "fs-extra": "0.16.3",
     "glob": "^4.0.5"
   },