diff --git a/package.json b/package.json
index ee422861f..d85374b6f 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   "electronVersion": "1.3.13",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "7.1.22",
+    "atom-keymap": "8.0.2",
     "atom-select-list": "0.0.15",
     "atom-ui": "0.4.1",
     "babel-core": "6.22.1",
@@ -40,18 +40,18 @@
     "devtron": "1.3.0",
     "event-kit": "^2.1.0",
     "find-parent-dir": "^0.3.0",
-    "first-mate": "6.3.0",
-    "fs-plus": "2.10.1",
+    "first-mate": "7.0.2",
+    "fs-plus": "^3.0.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
-    "git-utils": "4.1.2",
+    "git-utils": "5.0.0",
     "glob": "^7.1.1",
     "grim": "1.5.0",
     "jasmine-json": "~0.0",
     "jasmine-tagged": "^1.1.4",
     "jquery": "2.1.4",
     "key-path-helpers": "^0.4.0",
-    "less-cache": "0.23",
+    "less-cache": "1.0.0",
     "line-top-index": "0.2.0",
     "marked": "^0.3.6",
     "minimatch": "^3.0.3",
@@ -60,23 +60,23 @@
     "normalize-package-data": "^2.0.0",
     "nslog": "^3",
     "oniguruma": "6.1.0",
-    "pathwatcher": "6.9.0",
+    "pathwatcher": "7.0.0",
     "postcss": "5.2.4",
     "postcss-selector-parser": "2.2.1",
     "property-accessors": "^1.1.3",
     "random-words": "0.0.1",
     "resolve": "^1.1.6",
     "runas": "^3.1",
-    "scandal": "2.2.2",
+    "scandal": "^3.0.0",
     "scoped-property-store": "^0.17.0",
     "scrollbar-style": "^3.2",
-    "season": "^5.4.1",
+    "season": "^6.0.0",
     "semver": "^4.3.3",
     "service-hub": "^0.7.2",
     "sinon": "1.17.4",
     "source-map-support": "^0.3.2",
     "temp": "0.8.1",
-    "text-buffer": "10.5.0",
+    "text-buffer": "11.3.0",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",
@@ -96,47 +96,47 @@
     "solarized-dark-syntax": "1.1.2",
     "solarized-light-syntax": "1.1.2",
     "about": "1.7.5",
-    "archive-view": "0.63.0",
+    "archive-view": "0.63.1",
     "autocomplete-atom-api": "0.10.0",
     "autocomplete-css": "0.15.1",
     "autocomplete-html": "0.7.2",
     "autocomplete-plus": "2.34.2",
     "autocomplete-snippets": "1.11.0",
     "autoflow": "0.29.0",
-    "autosave": "0.24.0",
+    "autosave": "0.24.1",
     "background-tips": "0.26.1",
     "bookmarks": "0.44.2",
-    "bracket-matcher": "0.85.3",
+    "bracket-matcher": "0.85.4",
     "command-palette": "0.40.3",
     "dalek": "0.2.0",
-    "deprecation-cop": "0.56.2",
-    "dev-live-reload": "0.47.0",
+    "deprecation-cop": "0.56.4",
+    "dev-live-reload": "0.47.1",
     "encoding-selector": "0.23.2",
-    "exception-reporting": "0.41.2",
+    "exception-reporting": "0.41.3",
     "find-and-replace": "0.207.2",
-    "fuzzy-finder": "1.5.0",
-    "git-diff": "1.3.3",
+    "fuzzy-finder": "1.5.1",
+    "git-diff": "1.3.4",
     "go-to-line": "0.32.0",
     "grammar-selector": "0.49.3",
-    "image-view": "0.61.1",
+    "image-view": "0.61.2",
     "incompatible-packages": "0.27.1",
-    "keybinding-resolver": "0.36.3",
+    "keybinding-resolver": "0.36.4",
     "line-ending-selector": "0.6.2",
-    "link": "0.31.2",
-    "markdown-preview": "0.159.7",
-    "metrics": "1.2.1",
-    "notifications": "0.66.2",
+    "link": "0.31.3",
+    "markdown-preview": "0.159.9",
+    "metrics": "1.2.2",
+    "notifications": "0.67.1",
     "open-on-github": "1.2.1",
-    "package-generator": "1.1.0",
-    "settings-view": "0.248.0",
-    "snippets": "1.1.1",
+    "package-generator": "1.1.1",
+    "settings-view": "0.248.2",
+    "snippets": "1.1.3",
     "spell-check": "0.71.1",
-    "status-bar": "1.8.3",
-    "styleguide": "0.49.3",
-    "symbols-view": "0.115.2",
-    "tabs": "0.104.2",
+    "status-bar": "1.8.4",
+    "styleguide": "0.49.4",
+    "symbols-view": "0.115.3",
+    "tabs": "0.104.3",
     "timecop": "0.36.0",
-    "tree-view": "0.215.1",
+    "tree-view": "0.215.2",
     "update-package-dependencies": "0.11.0",
     "welcome": "0.36.2",
     "whitespace": "0.36.2",
diff --git a/spec/git-repository-spec.coffee b/spec/git-repository-spec.coffee
index 59e8c4c68..f1c433d76 100644
--- a/spec/git-repository-spec.coffee
+++ b/spec/git-repository-spec.coffee
@@ -31,11 +31,6 @@ describe "GitRepository", ->
       expect(-> new GitRepository(path.join(temp.dir, 'nogit.txt'))).toThrow()
 
   describe ".getPath()", ->
-    it "returns the repository path for a .git directory path with a file", ->
-      return if process.platform is 'win32' #Win32TestFailures - libgit2 does not detect files in .git folders
-      repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD'))
-      expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git')
-
     it "returns the repository path for a .git directory path with a directory", ->
       repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'objects'))
       expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git')
diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
index 795f1b43e..7c43ac2f3 100644
--- a/spec/theme-manager-spec.coffee
+++ b/spec/theme-manager-spec.coffee
@@ -194,10 +194,10 @@ describe "atom.themes", ->
       expect(element.getAttribute('source-path')).toEqualPath lessPath
       expect(element.textContent).toBe """
       #header {
-        color: #4d926f;
+        color: #4D926F;
       }
       h2 {
-        color: #4d926f;
+        color: #4D926F;
       }
 
       """
diff --git a/static/variables/octicon-mixins.less b/static/variables/octicon-mixins.less
index c58ce3a52..672a2cef6 100644
--- a/static/variables/octicon-mixins.less
+++ b/static/variables/octicon-mixins.less
@@ -1,3 +1,5 @@
+@import "octicon-utf-codes.less";
+
 .icon-size(@size) {
   font-size: @size;
   width: @size;
@@ -17,7 +19,6 @@
 }
 
 .octicon(@name, @size: 16px) {
-  @import "octicon-utf-codes.less";
   &::before {
     .icon(@size);
     content: @@name
@@ -25,7 +26,6 @@
 }
 
 .mega-octicon(@name, @size: 32px) {
-  @import "octicon-utf-codes.less";
   &::before {
     .icon(@size);
     content: @@name