Merge branch 'master' into aw-filewatcher

package.json

@@ -14,6 +14,7 @@
   "license": "MIT",
   "electronVersion": "1.6.9",
   "dependencies": {
+    "@atom/source-map-support": "^0.3.4",
     "async": "0.2.6",
     "atom-keymap": "8.2.2",
     "atom-select-list": "^0.1.0",
@@ -38,6 +39,7 @@
     "glob": "^7.1.1",
     "grim": "1.5.0",
     "jasmine-json": "~0.0",
+    "jasmine-reporters": "1.1.0",
     "jasmine-tagged": "^1.1.4",
     "key-path-helpers": "^0.4.0",
     "less-cache": "1.1.0",
@@ -45,6 +47,8 @@
     "marked": "^0.3.6",
     "minimatch": "^3.0.3",
     "mocha": "2.5.1",
+    "mocha-junit-reporter": "^1.13.0",
+    "mocha-multi-reporters": "^1.1.4",
     "mock-spawn": "^0.2.6",
     "normalize-package-data": "^2.0.0",
     "nsfw": "^1.0.15",
@@ -64,7 +68,6 @@
     "semver": "^4.3.3",
     "service-hub": "^0.7.4",
     "sinon": "1.17.4",
-    "@atom/source-map-support": "^0.3.4",
     "temp": "^0.8.3",
     "text-buffer": "13.0.8",
     "typescript-simple": "1.0.0",
@@ -127,7 +130,7 @@
     "symbols-view": "0.117.0",
     "tabs": "0.106.2",
     "timecop": "0.36.0",
-    "tree-view": "0.217.5",
+    "tree-view": "0.217.6",
     "update-package-dependencies": "0.12.0",
     "welcome": "0.36.5",
     "whitespace": "0.37.2",
@@ -150,7 +153,7 @@
     "language-mustache": "0.14.1",
     "language-objective-c": "0.15.1",
     "language-perl": "0.37.0",
-    "language-php": "0.40.0",
+    "language-php": "0.41.0",
     "language-property-list": "0.9.1",
     "language-python": "0.45.4",
     "language-ruby": "0.71.2",