Merge branch 'master' into chrome35

Conflicts:
	apm/package.json
	package.json

package.json

@@ -28,10 +28,10 @@
     "delegato": "^1",
     "emissary": "^1.2.1",
     "first-mate": "^2.0.0",
-    "fs-plus": "^2.2.3",
+    "fs-plus": "^2.2.4",
     "fstream": "0.1.24",
     "fuzzaldrin": "^1.1",
-    "git-utils": "^2.0",
+    "git-utils": "^2.1",
     "grim": "0.11.0",
     "guid": "0.0.10",
     "jasmine-tagged": "^1.1.2",
@@ -41,7 +41,7 @@
     "nslog": "^1.0.0",
     "oniguruma": "^3.0.0",
     "optimist": "0.4.0",
-    "pathwatcher": "^2.0.2",
+    "pathwatcher": "^2.0.3",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -67,7 +67,7 @@
     "atom-light-syntax": "0.20.0",
     "atom-light-ui": "0.28.0",
     "base16-tomorrow-dark-theme": "0.19.0",
-    "solarized-dark-syntax": "0.20.0",
+    "solarized-dark-syntax": "0.21.0",
     "solarized-light-syntax": "0.11.0",
     "archive-view": "1.0.0",
     "autocomplete": "0.28.0",
@@ -81,7 +81,7 @@
     "dev-live-reload": "1.0.0",
     "exception-reporting": "0.18.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.126.0",
+    "find-and-replace": "0.127.0",
     "fuzzy-finder": "0.57.0",
     "git-diff": "0.37.0",
     "go-to-line": "0.23.0",
@@ -102,7 +102,7 @@
     "symbols-view": "1.0.0",
     "tabs": "0.45.0",
     "timecop": "0.21.0",
-    "tree-view": "1.0.0",
+    "tree-view": "1.1.0",
     "update-package-dependencies": "0.6.0",
     "welcome": "0.17.0",
     "whitespace": "0.25.0",
@@ -111,7 +111,7 @@
     "language-c": "0.22.0",
     "language-coffee-script": "0.27.0",
     "language-css": "0.17.0",
-    "language-gfm": "0.42.0",
+    "language-gfm": "0.43.0",
     "language-git": "0.9.0",
     "language-go": "0.13.0",
     "language-html": "0.22.0",
@@ -119,7 +119,7 @@
     "language-java": "0.11.0",
     "language-javascript": "0.36.0",
     "language-json": "0.8.0",
-    "language-less": "0.12.0",
+    "language-less": "0.13.0",
     "language-make": "0.10.0",
     "language-objective-c": "0.11.0",
     "language-perl": "0.9.0",
@@ -128,7 +128,7 @@
     "language-python": "0.18.0",
     "language-ruby": "0.33.0",
     "language-ruby-on-rails": "0.15.0",
-    "language-sass": "0.13.0",
+    "language-sass": "0.14.0",
     "language-shellscript": "0.8.0",
     "language-source": "0.7.0",
     "language-sql": "0.9.0",
@@ -136,7 +136,7 @@
     "language-todo": "0.10.0",
     "language-toml": "0.12.0",
     "language-xml": "0.15.0",
-    "language-yaml": "0.11.0"
+    "language-yaml": "0.13.0"
   },
   "private": true,
   "scripts": {