Merge pull request #277 from steveklabnik/upgrade_ember

Update ember and remove an outdated dep

Author: alexcrichton

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "cargo",
   "dependencies": {
-    "ember": "2.3.1",
+    "ember": "2.4.0",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.1",
     "ember-load-initializers": "0.1.7",

package.json

@@ -39,7 +39,6 @@
     "ember-cli-sri": "^1.2.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-data": "2.4.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
     "ember-moment": "4.1.0",
     "ember-page-title": "2.0.7",