Merge master into fix-color-problems-using-electron-2.0

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "2.0.0",
+  "electronVersion": "2.0.1",
   "dependencies": {
     "@atom/nsfw": "^1.0.18",
     "@atom/watcher": "1.0.3",
@@ -33,7 +33,7 @@
     "etch": "^0.12.6",
     "event-kit": "^2.5.0",
     "find-parent-dir": "^0.3.0",
-    "first-mate": "7.1.0",
+    "first-mate": "7.1.1",
     "focus-trap": "^2.3.0",
     "fs-admin": "^0.1.6",
     "fs-plus": "^3.0.1",