Merge branch 'master' into as-ns-use-apm-with-npm3-and-node-4

package.json

@@ -93,8 +93,8 @@
     "encoding-selector": "0.22.0",
     "exception-reporting": "0.38.1",
     "find-and-replace": "0.201.0",
-    "fuzzy-finder": "1.3.0-sync-git",
-    "git-diff": "1.1.0-sync-git",
+    "fuzzy-finder": "1.3.0",
+    "git-diff": "1.1.0",
     "go-to-line": "0.31.0",
     "grammar-selector": "0.48.1",
     "image-view": "0.58.2",
@@ -105,12 +105,12 @@
     "markdown-preview": "0.158.0",
     "metrics": "0.53.1",
     "notifications": "0.65.0",
-    "open-on-github": "1.2.0-sync-git",
+    "open-on-github": "1.2.0",
     "package-generator": "1.0.0",
     "settings-view": "0.240.1",
     "snippets": "1.0.2",
     "spell-check": "0.67.1",
-    "status-bar": "1.4.0-sync-git",
+    "status-bar": "1.4.0",
     "styleguide": "0.47.0",
     "symbols-view": "0.113.0",
     "tabs": "0.99.0",

script/cibuild

@@ -62,6 +62,7 @@ function removeNodeModules() {
 
   try {
     fsPlus.removeSync(path.resolve(__dirname, '..', 'node_modules'));
+    fsPlus.removeSync(path.resolve(__dirname, '..', 'apm', 'node_modules'));
   } catch (error) {
     console.error(error.message);
     process.exit(1);