Merge pull request #309 from kellyselden/test-updates

test lib updates

Author: rwjblue

package.json

@@ -40,8 +40,8 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "chai": "^2.2.0",
-    "chai-fs": "peterkc/chai-fs#31deec5232297e2887a2ffb39b9081364c8e78e1",
+    "chai": "^3.0.0",
+    "chai-fs": "^1.0.0",
     "cpr": "^1.1.1",
     "ember-ajax": "^2.4.1",
     "ember-cli": "2.10.0",
@@ -66,7 +66,7 @@
     "fs-extra": "^0.24.0",
     "glob": "^7.0.0",
     "loader.js": "^4.0.10",
-    "mocha": "^2.2.4",
+    "mocha": "^3.0.0",
     "request": "^2.55.0",
     "sinon": "^1.17.4",
     "symlink-or-copy": "^1.0.1",