diff --git a/package.json b/package.json
index 55a741113..e6c1dd9c8 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "coffeestack": "0.7.0",
     "delegato": "^1",
     "emissary": "^1.2.1",
-    "first-mate": "^1.7",
+    "first-mate": "^1.7.1",
     "fs-plus": "^2.2.3",
     "fstream": "0.1.24",
     "fuzzaldrin": "^1.1",
@@ -86,15 +86,15 @@
     "git-diff": "0.34.0",
     "go-to-line": "0.23.0",
     "grammar-selector": "0.27.0",
-    "image-view": "0.35.0",
+    "image-view": "0.36.0",
     "keybinding-resolver": "0.18.0",
     "link": "0.24.0",
-    "markdown-preview": "0.84.0",
+    "markdown-preview": "0.85.0",
     "metrics": "0.32.0",
     "open-on-github": "0.29.0",
     "package-generator": "0.31.0",
     "release-notes": "0.32.0",
-    "settings-view": "0.128.0",
+    "settings-view": "0.129.0",
     "snippets": "0.47.0",
     "spell-check": "0.38.0",
     "status-bar": "0.41.0",
@@ -102,7 +102,7 @@
     "symbols-view": "0.59.0",
     "tabs": "0.42.0",
     "timecop": "0.21.0",
-    "tree-view": "0.107.0",
+    "tree-view": "0.108.0",
     "update-package-dependencies": "0.6.0",
     "welcome": "0.17.0",
     "whitespace": "0.22.0",
@@ -113,11 +113,11 @@
     "language-css": "0.17.0",
     "language-gfm": "0.42.0",
     "language-git": "0.9.0",
-    "language-go": "0.12.0",
+    "language-go": "0.13.0",
     "language-html": "0.22.0",
     "language-hyperlink": "0.10.0",
     "language-java": "0.11.0",
-    "language-javascript": "0.29.0",
+    "language-javascript": "0.30.0",
     "language-json": "0.8.0",
     "language-less": "0.9.0",
     "language-make": "0.10.0",
diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee
index 7c8d30003..aadc7c28a 100644
--- a/spec/tokenized-buffer-spec.coffee
+++ b/spec/tokenized-buffer-spec.coffee
@@ -1,7 +1,7 @@
 TokenizedBuffer = require '../src/tokenized-buffer'
 _ = require 'underscore-plus'
 
-describe "TokenizedBuffer", ->
+fdescribe "TokenizedBuffer", ->
   [tokenizedBuffer, buffer, changeHandler] = []
 
   beforeEach ->
@@ -335,12 +335,13 @@ describe "TokenizedBuffer", ->
         expect(screenLine0.text).toBe "# Econ 101#{tabAsSpaces}"
         { tokens } = screenLine0
 
-        expect(tokens.length).toBe 3
+        expect(tokens.length).toBe 4
         expect(tokens[0].value).toBe "#"
         expect(tokens[1].value).toBe " Econ 101"
         expect(tokens[2].value).toBe tabAsSpaces
         expect(tokens[2].scopes).toEqual tokens[1].scopes
         expect(tokens[2].isAtomic).toBeTruthy()
+        expect(tokens[3].value).toBe ""
 
         expect(tokenizedBuffer.lineForScreenRow(2).text).toBe "#{tabAsSpaces} buy()#{tabAsSpaces}while supply > demand"
 
@@ -411,7 +412,7 @@ describe "TokenizedBuffer", ->
         expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].bufferDelta).toBe 1
         expect(tokenizedBuffer.lineForScreenRow(2).tokens[1].screenDelta).toBe 1
 
-  describe "when the buffer contains surrogate pairs", ->
+  describe "when the buffer contains UTF-8 surrogate pairs", ->
     beforeEach ->
       waitsForPromise ->
         atom.packages.activatePackage('language-javascript')
@@ -429,7 +430,7 @@ describe "TokenizedBuffer", ->
       tokenizedBuffer.destroy()
       buffer.release()
 
-    it "renders each surrogate pair as its own atomic token", ->
+    it "renders each UTF-8 surrogate pair as its own atomic token", ->
       screenLine0 = tokenizedBuffer.lineForScreenRow(0)
       expect(screenLine0.text).toBe "'abc\uD835\uDF97def'"
       { tokens } = screenLine0
@@ -446,11 +447,12 @@ describe "TokenizedBuffer", ->
       expect(screenLine1.text).toBe "//\uD835\uDF97xyz"
       { tokens } = screenLine1
 
-      expect(tokens.length).toBe 3
+      expect(tokens.length).toBe 4
       expect(tokens[0].value).toBe '//'
       expect(tokens[1].value).toBe '\uD835\uDF97'
       expect(tokens[1].value).toBeTruthy()
       expect(tokens[2].value).toBe 'xyz'
+      expect(tokens[3].value).toBe ''
 
   describe "when the grammar is tokenized", ->
     it "emits the `tokenized` event", ->