Merge branch 'master' into clostridium

* master:
  ember 2.2.0 & ember-data 2.2.1

bower.json

@@ -2,10 +2,10 @@
   "name": "clostridiumdotinfo",
   "dependencies": {
     "jquery": "~2.1.1",
-    "ember": "~2.1.0",
+    "ember": "~2.2.0",
     "ember-cli-shims": "0.0.6",
     "ember-cli-test-loader": "0.2.1",
-    "ember-data": "~2.1.0",
+    "ember-data": "~2.2.1",
     "ember-load-initializers": "0.1.7",
     "ember-qunit": "0.4.16",
     "ember-qunit-notifications": "~0.1.0",

package.json

@@ -35,7 +35,7 @@
     "ember-cli-release": "0.2.8",
     "ember-cli-sri": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "1.13.15",
+    "ember-data": "~2.2.1",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
     "ember-one-way-input": "0.1.3",