Merge remote-tracking branch 'origin/master' into cj-tabs-be-weird

package.json

@@ -41,7 +41,7 @@
     "nslog": "0.5.0",
     "oniguruma": "^1.0.6",
     "optimist": "0.4.0",
-    "pathwatcher": "^1.2.2",
+    "pathwatcher": "^1.2.3",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -81,7 +81,7 @@
     "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
     "feedback": "0.32.0",
-    "find-and-replace": "0.100.0",
+    "find-and-replace": "0.101.0",
     "fuzzy-finder": "0.50.0",
     "git-diff": "0.28.0",
     "go-to-line": "0.19.0",