Merge pull request #268 from steveklabnik/upgrade_ember

Upgrade ember

Author: alexcrichton

bower.json

@@ -1,10 +1,9 @@
 {
   "name": "cargo",
   "dependencies": {
-    "ember": "1.13.11",
-    "ember-cli-shims": "0.0.6",
+    "ember": "2.3.1",
+    "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.1",
-    "ember-data": "1.13.15",
     "ember-load-initializers": "0.1.7",
     "ember-qunit": "0.4.16",
     "ember-qunit-notifications": "0.1.0",

package.json

@@ -22,10 +22,11 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
-    "ember-cli": "1.13.13",
+    "ember-cli": "2.3.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
     "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-fastboot": "0.4.3",
     "ember-cli-htmlbars": "^1.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-ic-ajax": "0.2.4",
@@ -37,14 +38,18 @@
     "ember-cli-sass": "5.0.1",
     "ember-cli-sri": "^1.2.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "1.13.15",
+    "ember-data": "2.3.1",
     "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",
     "ember-rl-dropdown": "0.7.0",
     "ember-route-alias": "^0.1.3",
     "ember-suave": "1.2.3",
-    "emberx-select": "2.0.2"
+    "emberx-select": "2.0.2",
+    "loader.js": "4.0.1"
+  },
+  "dependencies": {
+    "ember-load-initializers": "^0.5.1"
   }
 }