Merge branch 'master' of https://github.com/atom/atom

.travis.yml

@@ -10,7 +10,7 @@ matrix:
   include:
     - os: linux
       dist: trusty
-      env: NODE_VERSION=6.9.4 DISPLAY=:99.0 CXX=g++-6 CC=gcc-6
+      env: NODE_VERSION=6.9.4 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1
 
 sudo: required
 
@@ -51,11 +51,9 @@ addons:
       - out/atom-amd64.tar.gz
     target_paths: travis-artifacts/$TRAVIS_BUILD_ID
   apt:
-    sources:
-    - ubuntu-toolchain-r-test
     packages:
-    - gcc-6
-    - g++-6
+    - build-essential
+    - clang-3.3
     - fakeroot
     - git
     - libsecret-1-dev

package.json

@@ -65,7 +65,7 @@
     "sinon": "1.17.4",
     "@atom/source-map-support": "^0.3.4",
     "temp": "^0.8.3",
-    "text-buffer": "13.0.3",
+    "text-buffer": "13.0.4",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",