diff --git a/node_modules/cmd-shim/README.md b/node_modules/cmd-shim/README.md
index 951d3c18c6c8a..ff6745f8e5970 100644
--- a/node_modules/cmd-shim/README.md
+++ b/node_modules/cmd-shim/README.md
@@ -6,8 +6,8 @@ since symlinks are not suitable for this purpose there.
 On Unix systems, you should use a symbolic link instead.
 
 [![Build Status](https://img.shields.io/travis/ForbesLindesay/cmd-shim/master.svg)](https://travis-ci.org/ForbesLindesay/cmd-shim)
-[![Dependency Status](https://img.shields.io/gemnasium/ForbesLindesay/cmd-shim.svg)](https://gemnasium.com/ForbesLindesay/cmd-shim)
-[![NPM version](https://img.shields.io/npm/v/cmd-shim.svg)](http://badge.fury.io/js/cmd-shim)
+[![Dependency Status](https://img.shields.io/david/ForbesLindesay/cmd-shim.svg)](https://david-dm.org/ForbesLindesay/cmd-shim)
+[![NPM version](https://img.shields.io/npm/v/cmd-shim.svg)](https://www.npmjs.com/package/cmd-shim)
 
 ## Installation
 
diff --git a/node_modules/cmd-shim/index.js b/node_modules/cmd-shim/index.js
index 59a1f6cbd62da..9f22e103a5fe8 100644
--- a/node_modules/cmd-shim/index.js
+++ b/node_modules/cmd-shim/index.js
@@ -109,7 +109,7 @@ function writeShim_ (from, to, prog, args, cb) {
         + "  " + prog + " " + args + " " + target + " %*\r\n"
         + ")"
   } else {
-    cmd = prog + " " + args + " " + target + " %*\r\n"
+    cmd = "@" + prog + " " + args + " " + target + " %*\r\n"
   }
 
   // #!/bin/sh
@@ -132,7 +132,7 @@ function writeShim_ (from, to, prog, args, cb) {
 
   if (shLongProg) {
     sh = sh
-        + "basedir=`dirname \"$0\"`\n"
+        + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
         + "\n"
         + "case `uname` in\n"
         + "    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n"
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/.npmignore b/node_modules/cmd-shim/node_modules/graceful-fs/.npmignore
deleted file mode 100644
index c2658d7d1b318..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/LICENSE b/node_modules/cmd-shim/node_modules/graceful-fs/LICENSE
deleted file mode 100644
index 19129e315fe59..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/README.md b/node_modules/cmd-shim/node_modules/graceful-fs/README.md
deleted file mode 100644
index 13a2e86050a3e..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# graceful-fs
-
-graceful-fs functions as a drop-in replacement for the fs module,
-making various improvements.
-
-The improvements are meant to normalize behavior across different
-platforms and environments, and to make filesystem access more
-resilient to errors.
-
-## Improvements over [fs module](http://api.nodejs.org/fs.html)
-
-graceful-fs:
-
-* Queues up `open` and `readdir` calls, and retries them once
-  something closes if there is an EMFILE error from too many file
-  descriptors.
-* fixes `lchmod` for Node versions prior to 0.6.2.
-* implements `fs.lutimes` if possible. Otherwise it becomes a noop.
-* ignores `EINVAL` and `EPERM` errors in `chown`, `fchown` or
-  `lchown` if the user isn't root.
-* makes `lchmod` and `lchown` become noops, if not available.
-* retries reading a file if `read` results in EAGAIN error.
-
-On Windows, it retries renaming a file for up to one second if `EACCESS`
-or `EPERM` error occurs, likely because antivirus software has locked
-the directory.
-
-## USAGE
-
-```javascript
-// use just like fs
-var fs = require('graceful-fs')
-
-// now go and do stuff with it...
-fs.readFileSync('some-file-or-whatever')
-```
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/fs.js b/node_modules/cmd-shim/node_modules/graceful-fs/fs.js
deleted file mode 100644
index 64ad980232ec0..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/fs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// eeeeeevvvvviiiiiiillllll
-// more evil than monkey-patching the native builtin?
-// Not sure.
-
-var mod = require("module")
-var pre = '(function (exports, require, module, __filename, __dirname) { '
-var post = '});'
-var src = pre + process.binding('natives').fs + post
-var vm = require('vm')
-var fn = vm.runInThisContext(src)
-fn(exports, require, module, __filename, __dirname)
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/graceful-fs.js b/node_modules/cmd-shim/node_modules/graceful-fs/graceful-fs.js
deleted file mode 100644
index fb206b83854a1..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/graceful-fs.js
+++ /dev/null
@@ -1,158 +0,0 @@
-// Monkey-patching the fs module.
-// It's ugly, but there is simply no other way to do this.
-var fs = module.exports = require('./fs.js')
-
-var assert = require('assert')
-
-// fix up some busted stuff, mostly on windows and old nodes
-require('./polyfills.js')
-
-var util = require('util')
-
-function noop () {}
-
-var debug = noop
-if (util.debuglog)
-  debug = util.debuglog('gfs')
-else if (/\bgfs\b/i.test(process.env.NODE_DEBUG || ''))
-  debug = function() {
-    var m = util.format.apply(util, arguments)
-    m = 'GFS: ' + m.split(/\n/).join('\nGFS: ')
-    console.error(m)
-  }
-
-if (/\bgfs\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug('fds', fds)
-    debug(queue)
-    assert.equal(queue.length, 0)
-  })
-}
-
-
-var originalOpen = fs.open
-fs.open = open
-
-function open(path, flags, mode, cb) {
-  if (typeof mode === "function") cb = mode, mode = null
-  if (typeof cb !== "function") cb = noop
-  new OpenReq(path, flags, mode, cb)
-}
-
-function OpenReq(path, flags, mode, cb) {
-  this.path = path
-  this.flags = flags
-  this.mode = mode
-  this.cb = cb
-  Req.call(this)
-}
-
-util.inherits(OpenReq, Req)
-
-OpenReq.prototype.process = function() {
-  originalOpen.call(fs, this.path, this.flags, this.mode, this.done)
-}
-
-var fds = {}
-OpenReq.prototype.done = function(er, fd) {
-  debug('open done', er, fd)
-  if (fd)
-    fds['fd' + fd] = this.path
-  Req.prototype.done.call(this, er, fd)
-}
-
-
-var originalReaddir = fs.readdir
-fs.readdir = readdir
-
-function readdir(path, cb) {
-  if (typeof cb !== "function") cb = noop
-  new ReaddirReq(path, cb)
-}
-
-function ReaddirReq(path, cb) {
-  this.path = path
-  this.cb = cb
-  Req.call(this)
-}
-
-util.inherits(ReaddirReq, Req)
-
-ReaddirReq.prototype.process = function() {
-  originalReaddir.call(fs, this.path, this.done)
-}
-
-ReaddirReq.prototype.done = function(er, files) {
-  if (files && files.sort)
-    files = files.sort()
-  Req.prototype.done.call(this, er, files)
-  onclose()
-}
-
-
-var originalClose = fs.close
-fs.close = close
-
-function close (fd, cb) {
-  debug('close', fd)
-  if (typeof cb !== "function") cb = noop
-  delete fds['fd' + fd]
-  originalClose.call(fs, fd, function(er) {
-    onclose()
-    cb(er)
-  })
-}
-
-
-var originalCloseSync = fs.closeSync
-fs.closeSync = closeSync
-
-function closeSync (fd) {
-  try {
-    return originalCloseSync(fd)
-  } finally {
-    onclose()
-  }
-}
-
-
-// Req class
-function Req () {
-  // start processing
-  this.done = this.done.bind(this)
-  this.failures = 0
-  this.process()
-}
-
-Req.prototype.done = function (er, result) {
-  var tryAgain = false
-  if (er) {
-    var code = er.code
-    var tryAgain = code === "EMFILE" || code === "ENFILE"
-    if (process.platform === "win32")
-      tryAgain = tryAgain || code === "OK"
-  }
-
-  if (tryAgain) {
-    this.failures ++
-    enqueue(this)
-  } else {
-    var cb = this.cb
-    cb(er, result)
-  }
-}
-
-var queue = []
-
-function enqueue(req) {
-  queue.push(req)
-  debug('enqueue %d %s', queue.length, req.constructor.name, req)
-}
-
-function onclose() {
-  var req = queue.shift()
-  if (req) {
-    debug('process', req.constructor.name, req)
-    req.process()
-  }
-}
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/package.json b/node_modules/cmd-shim/node_modules/graceful-fs/package.json
deleted file mode 100644
index 3cf87fb43a656..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/package.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me"
-  },
-  "name": "graceful-fs",
-  "description": "A drop-in replacement for fs, making various improvements.",
-  "version": "3.0.8",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-graceful-fs.git"
-  },
-  "main": "graceful-fs.js",
-  "engines": {
-    "node": ">=0.4.0"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "keywords": [
-    "fs",
-    "module",
-    "reading",
-    "retry",
-    "retries",
-    "queue",
-    "error",
-    "errors",
-    "handling",
-    "EMFILE",
-    "EAGAIN",
-    "EINVAL",
-    "EPERM",
-    "EACCESS"
-  ],
-  "license": "ISC",
-  "devDependencies": {
-    "mkdirp": "^0.5.0",
-    "rimraf": "^2.2.8",
-    "tap": "^1.2.0"
-  },
-  "readme": "# graceful-fs\n\ngraceful-fs functions as a drop-in replacement for the fs module,\nmaking various improvements.\n\nThe improvements are meant to normalize behavior across different\nplatforms and environments, and to make filesystem access more\nresilient to errors.\n\n## Improvements over [fs module](http://api.nodejs.org/fs.html)\n\ngraceful-fs:\n\n* Queues up `open` and `readdir` calls, and retries them once\n  something closes if there is an EMFILE error from too many file\n  descriptors.\n* fixes `lchmod` for Node versions prior to 0.6.2.\n* implements `fs.lutimes` if possible. Otherwise it becomes a noop.\n* ignores `EINVAL` and `EPERM` errors in `chown`, `fchown` or\n  `lchown` if the user isn't root.\n* makes `lchmod` and `lchown` become noops, if not available.\n* retries reading a file if `read` results in EAGAIN error.\n\nOn Windows, it retries renaming a file for up to one second if `EACCESS`\nor `EPERM` error occurs, likely because antivirus software has locked\nthe directory.\n\n## USAGE\n\n```javascript\n// use just like fs\nvar fs = require('graceful-fs')\n\n// now go and do stuff with it...\nfs.readFileSync('some-file-or-whatever')\n```\n",
-  "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-graceful-fs/issues"
-  },
-  "homepage": "https://github.com/isaacs/node-graceful-fs#readme",
-  "_id": "graceful-fs@3.0.8",
-  "_shasum": "ce813e725fa82f7e6147d51c9a5ca68270551c22",
-  "_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
-  "_from": "graceful-fs@>3.0.1 <4.0.0-0"
-}
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/polyfills.js b/node_modules/cmd-shim/node_modules/graceful-fs/polyfills.js
deleted file mode 100644
index 42705391aa9b7..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/polyfills.js
+++ /dev/null
@@ -1,255 +0,0 @@
-var fs = require('./fs.js')
-var constants = require('constants')
-
-var origCwd = process.cwd
-var cwd = null
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
-}
-
-// (re-)implement some things that are known busted or missing.
-
-// lchmod, broken prior to 0.6.2
-// back-port the fix here.
-if (constants.hasOwnProperty('O_SYMLINK') &&
-    process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
-  fs.lchmod = function (path, mode, callback) {
-    callback = callback || noop
-    fs.open( path
-           , constants.O_WRONLY | constants.O_SYMLINK
-           , mode
-           , function (err, fd) {
-      if (err) {
-        callback(err)
-        return
-      }
-      // prefer to return the chmod error, if one occurs,
-      // but still try to close, and report closing errors if they occur.
-      fs.fchmod(fd, mode, function (err) {
-        fs.close(fd, function(err2) {
-          callback(err || err2)
-        })
-      })
-    })
-  }
-
-  fs.lchmodSync = function (path, mode) {
-    var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
-
-    // prefer to return the chmod error, if one occurs,
-    // but still try to close, and report closing errors if they occur.
-    var err, err2
-    try {
-      var ret = fs.fchmodSync(fd, mode)
-    } catch (er) {
-      err = er
-    }
-    try {
-      fs.closeSync(fd)
-    } catch (er) {
-      err2 = er
-    }
-    if (err || err2) throw (err || err2)
-    return ret
-  }
-}
-
-
-// lutimes implementation, or no-op
-if (!fs.lutimes) {
-  if (constants.hasOwnProperty("O_SYMLINK")) {
-    fs.lutimes = function (path, at, mt, cb) {
-      fs.open(path, constants.O_SYMLINK, function (er, fd) {
-        cb = cb || noop
-        if (er) return cb(er)
-        fs.futimes(fd, at, mt, function (er) {
-          fs.close(fd, function (er2) {
-            return cb(er || er2)
-          })
-        })
-      })
-    }
-
-    fs.lutimesSync = function (path, at, mt) {
-      var fd = fs.openSync(path, constants.O_SYMLINK)
-        , err
-        , err2
-        , ret
-
-      try {
-        var ret = fs.futimesSync(fd, at, mt)
-      } catch (er) {
-        err = er
-      }
-      try {
-        fs.closeSync(fd)
-      } catch (er) {
-        err2 = er
-      }
-      if (err || err2) throw (err || err2)
-      return ret
-    }
-
-  } else if (fs.utimensat && constants.hasOwnProperty("AT_SYMLINK_NOFOLLOW")) {
-    // maybe utimensat will be bound soonish?
-    fs.lutimes = function (path, at, mt, cb) {
-      fs.utimensat(path, at, mt, constants.AT_SYMLINK_NOFOLLOW, cb)
-    }
-
-    fs.lutimesSync = function (path, at, mt) {
-      return fs.utimensatSync(path, at, mt, constants.AT_SYMLINK_NOFOLLOW)
-    }
-
-  } else {
-    fs.lutimes = function (_a, _b, _c, cb) { process.nextTick(cb) }
-    fs.lutimesSync = function () {}
-  }
-}
-
-
-// https://github.com/isaacs/node-graceful-fs/issues/4
-// Chown should not fail on einval or eperm if non-root.
-// It should not fail on enosys ever, as this just indicates
-// that a fs doesn't support the intended operation.
-
-fs.chown = chownFix(fs.chown)
-fs.fchown = chownFix(fs.fchown)
-fs.lchown = chownFix(fs.lchown)
-
-fs.chmod = chownFix(fs.chmod)
-fs.fchmod = chownFix(fs.fchmod)
-fs.lchmod = chownFix(fs.lchmod)
-
-fs.chownSync = chownFixSync(fs.chownSync)
-fs.fchownSync = chownFixSync(fs.fchownSync)
-fs.lchownSync = chownFixSync(fs.lchownSync)
-
-fs.chmodSync = chownFix(fs.chmodSync)
-fs.fchmodSync = chownFix(fs.fchmodSync)
-fs.lchmodSync = chownFix(fs.lchmodSync)
-
-function chownFix (orig) {
-  if (!orig) return orig
-  return function (target, uid, gid, cb) {
-    return orig.call(fs, target, uid, gid, function (er, res) {
-      if (chownErOk(er)) er = null
-      cb(er, res)
-    })
-  }
-}
-
-function chownFixSync (orig) {
-  if (!orig) return orig
-  return function (target, uid, gid) {
-    try {
-      return orig.call(fs, target, uid, gid)
-    } catch (er) {
-      if (!chownErOk(er)) throw er
-    }
-  }
-}
-
-// ENOSYS means that the fs doesn't support the op. Just ignore
-// that, because it doesn't matter.
-//
-// if there's no getuid, or if getuid() is something other
-// than 0, and the error is EINVAL or EPERM, then just ignore
-// it.
-//
-// This specific case is a silent failure in cp, install, tar,
-// and most other unix tools that manage permissions.
-//
-// When running as root, or if other types of errors are
-// encountered, then it's strict.
-function chownErOk (er) {
-  if (!er)
-    return true
-
-  if (er.code === "ENOSYS")
-    return true
-
-  var nonroot = !process.getuid || process.getuid() !== 0
-  if (nonroot) {
-    if (er.code === "EINVAL" || er.code === "EPERM")
-      return true
-  }
-
-  return false
-}
-
-
-// if lchmod/lchown do not exist, then make them no-ops
-if (!fs.lchmod) {
-  fs.lchmod = function (path, mode, cb) {
-    process.nextTick(cb)
-  }
-  fs.lchmodSync = function () {}
-}
-if (!fs.lchown) {
-  fs.lchown = function (path, uid, gid, cb) {
-    process.nextTick(cb)
-  }
-  fs.lchownSync = function () {}
-}
-
-
-
-// on Windows, A/V software can lock the directory, causing this
-// to fail with an EACCES or EPERM if the directory contains newly
-// created files.  Try again on failure, for up to 1 second.
-if (process.platform === "win32") {
-  var rename_ = fs.rename
-  fs.rename = function rename (from, to, cb) {
-    var start = Date.now()
-    rename_(from, to, function CB (er) {
-      if (er
-          && (er.code === "EACCES" || er.code === "EPERM")
-          && Date.now() - start < 1000) {
-        return rename_(from, to, CB)
-      }
-      if(cb) cb(er)
-    })
-  }
-}
-
-
-// if read() returns EAGAIN, then just try it again.
-var read = fs.read
-fs.read = function (fd, buffer, offset, length, position, callback_) {
-  var callback
-  if (callback_ && typeof callback_ === 'function') {
-    var eagCounter = 0
-    callback = function (er, _, __) {
-      if (er && er.code === 'EAGAIN' && eagCounter < 10) {
-        eagCounter ++
-        return read.call(fs, fd, buffer, offset, length, position, callback)
-      }
-      callback_.apply(this, arguments)
-    }
-  }
-  return read.call(fs, fd, buffer, offset, length, position, callback)
-}
-
-var readSync = fs.readSync
-fs.readSync = function (fd, buffer, offset, length, position) {
-  var eagCounter = 0
-  while (true) {
-    try {
-      return readSync.call(fs, fd, buffer, offset, length, position)
-    } catch (er) {
-      if (er.code === 'EAGAIN' && eagCounter < 10) {
-        eagCounter ++
-        continue
-      }
-      throw er
-    }
-  }
-}
-
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/test/max-open.js b/node_modules/cmd-shim/node_modules/graceful-fs/test/max-open.js
deleted file mode 100644
index a6b9ba43d3a6d..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/test/max-open.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var test = require('tap').test
-var fs = require('../')
-
-test('open lots of stuff', function (t) {
-  // Get around EBADF from libuv by making sure that stderr is opened
-  // Otherwise Darwin will refuse to give us a FD for stderr!
-  process.stderr.write('')
-
-  // How many parallel open()'s to do
-  var n = 1024
-  var opens = 0
-  var fds = []
-  var going = true
-  var closing = false
-  var doneCalled = 0
-
-  for (var i = 0; i < n; i++) {
-    go()
-  }
-
-  function go() {
-    opens++
-    fs.open(__filename, 'r', function (er, fd) {
-      if (er) throw er
-      fds.push(fd)
-      if (going) go()
-    })
-  }
-
-  // should hit ulimit pretty fast
-  setTimeout(function () {
-    going = false
-    t.equal(opens - fds.length, n)
-    done()
-  }, 100)
-
-
-  function done () {
-    if (closing) return
-    doneCalled++
-
-    if (fds.length === 0) {
-      console.error('done called %d times', doneCalled)
-      // First because of the timeout
-      // Then to close the fd's opened afterwards
-      // Then this time, to complete.
-      // Might take multiple passes, depending on CPU speed
-      // and ulimit, but at least 3 in every case.
-      t.ok(doneCalled >= 2)
-      return t.end()
-    }
-
-    closing = true
-    setTimeout(function () {
-      // console.error('do closing again')
-      closing = false
-      done()
-    }, 100)
-
-    // console.error('closing time')
-    var closes = fds.slice(0)
-    fds.length = 0
-    closes.forEach(function (fd) {
-      fs.close(fd, function (er) {
-        if (er) throw er
-      })
-    })
-  }
-})
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/test/open.js b/node_modules/cmd-shim/node_modules/graceful-fs/test/open.js
deleted file mode 100644
index 85732f236b002..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/test/open.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var test = require('tap').test
-var fs = require('../graceful-fs.js')
-
-test('graceful fs is monkeypatched fs', function (t) {
-  t.equal(fs, require('../fs.js'))
-  t.end()
-})
-
-test('open an existing file works', function (t) {
-  var fd = fs.openSync(__filename, 'r')
-  fs.closeSync(fd)
-  fs.open(__filename, 'r', function (er, fd) {
-    if (er) throw er
-    fs.close(fd, function (er) {
-      if (er) throw er
-      t.pass('works')
-      t.end()
-    })
-  })
-})
-
-test('open a non-existing file throws', function (t) {
-  var er
-  try {
-    var fd = fs.openSync('this file does not exist', 'r')
-  } catch (x) {
-    er = x
-  }
-  t.ok(er, 'should throw')
-  t.notOk(fd, 'should not get an fd')
-  t.equal(er.code, 'ENOENT')
-
-  fs.open('neither does this file', 'r', function (er, fd) {
-    t.ok(er, 'should throw')
-    t.notOk(fd, 'should not get an fd')
-    t.equal(er.code, 'ENOENT')
-    t.end()
-  })
-})
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/test/readdir-sort.js b/node_modules/cmd-shim/node_modules/graceful-fs/test/readdir-sort.js
deleted file mode 100644
index cb63a6846ed78..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/test/readdir-sort.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var test = require("tap").test
-var fs = require("../fs.js")
-
-var readdir = fs.readdir
-fs.readdir = function(path, cb) {
-  process.nextTick(function() {
-    cb(null, ["b", "z", "a"])
-  })
-}
-
-var g = require("../")
-
-test("readdir reorder", function (t) {
-  g.readdir("whatevers", function (er, files) {
-    if (er)
-      throw er
-    t.same(files, [ "a", "b", "z" ])
-    t.end()
-  })
-})
diff --git a/node_modules/cmd-shim/node_modules/graceful-fs/test/write-then-read.js b/node_modules/cmd-shim/node_modules/graceful-fs/test/write-then-read.js
deleted file mode 100644
index 21e4c26bf6c9d..0000000000000
--- a/node_modules/cmd-shim/node_modules/graceful-fs/test/write-then-read.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var fs = require('../');
-var rimraf = require('rimraf');
-var mkdirp = require('mkdirp');
-var test = require('tap').test;
-var p = require('path').resolve(__dirname, 'files');
-
-process.chdir(__dirname)
-
-// Make sure to reserve the stderr fd
-process.stderr.write('');
-
-var num = 4097;
-var paths = new Array(num);
-
-test('make files', function (t) {
-  rimraf.sync(p);
-  mkdirp.sync(p);
-
-  for (var i = 0; i < num; ++i) {
-    paths[i] = 'files/file-' + i;
-    fs.writeFileSync(paths[i], 'content');
-  }
-
-  t.end();
-})
-
-test('read files', function (t) {
-  // now read them
-  var done = 0;
-  for (var i = 0; i < num; ++i) {
-    fs.readFile(paths[i], function(err, data) {
-      if (err)
-        throw err;
-
-      ++done;
-      if (done === num) {
-        t.pass('success');
-        t.end()
-      }
-    });
-  }
-});
-
-test('cleanup', function (t) {
-  rimraf.sync(p);
-  t.end();
-});
diff --git a/node_modules/cmd-shim/package.json b/node_modules/cmd-shim/package.json
index 3833cf976c4b9..1867f1db86237 100644
--- a/node_modules/cmd-shim/package.json
+++ b/node_modules/cmd-shim/package.json
@@ -1,46 +1,77 @@
 {
-  "name": "cmd-shim",
-  "version": "2.0.1",
-  "description": "Used in npm for command line application support",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "cmd-shim@2.0.2",
+      "/Users/zkat/Documents/code/npm"
+    ]
+  ],
+  "_from": "cmd-shim@2.0.2",
+  "_id": "cmd-shim@2.0.2",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/cmd-shim",
+  "_nodeVersion": "1.6.2",
+  "_npmOperationalInternal": {
+    "host": "packages-6-west.internal.npmjs.com",
+    "tmp": "tmp/cmd-shim-2.0.2.tgz_1455116566936_0.7582207734230906"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ForbesLindesay/cmd-shim.git"
+  "_npmUser": {
+    "email": "forbes@lindesay.co.uk",
+    "name": "forbeslindesay"
+  },
+  "_npmVersion": "2.7.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "cmd-shim",
+    "raw": "cmd-shim@2.0.2",
+    "rawSpec": "2.0.2",
+    "scope": null,
+    "spec": "2.0.2",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz",
+  "_shasum": "6fcbda99483a8fd15d7d30a196ca69d688a2efdb",
+  "_shrinkwrap": null,
+  "_spec": "cmd-shim@2.0.2",
+  "_where": "/Users/zkat/Documents/code/npm",
+  "bugs": {
+    "url": "https://github.com/ForbesLindesay/cmd-shim/issues"
   },
-  "license": "BSD",
   "dependencies": {
-    "graceful-fs": ">3.0.1 <4.0.0-0",
+    "graceful-fs": "^4.1.2",
     "mkdirp": "~0.5.0"
   },
+  "description": "Used in npm for command line application support",
   "devDependencies": {
-    "tap": "~0.4.11",
-    "rimraf": "~2.2.8"
+    "rimraf": "~2.2.8",
+    "tap": "~0.4.11"
   },
-  "gitHead": "6f53d506be590fe9ac20c9801512cd1a3aad5974",
-  "bugs": {
-    "url": "https://github.com/ForbesLindesay/cmd-shim/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "6fcbda99483a8fd15d7d30a196ca69d688a2efdb",
+    "tarball": "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"
   },
+  "gitHead": "8492e2a92b5062bb02a9eec509e57eea94b110a7",
   "homepage": "https://github.com/ForbesLindesay/cmd-shim",
-  "_id": "cmd-shim@2.0.1",
-  "_shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
-  "_from": "cmd-shim@>=2.0.1 <2.1.0",
-  "_npmVersion": "1.5.0-alpha-4",
-  "_npmUser": {
-    "name": "forbeslindesay",
-    "email": "forbes@lindesay.co.uk"
-  },
+  "license": "BSD-2-Clause",
   "maintainers": [
     {
-      "name": "forbeslindesay",
-      "email": "forbes@lindesay.co.uk"
+      "email": "forbes@lindesay.co.uk",
+      "name": "forbeslindesay"
     }
   ],
-  "dist": {
-    "shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
-    "tarball": "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
+  "name": "cmd-shim",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ForbesLindesay/cmd-shim.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "2.0.2"
 }
diff --git a/node_modules/cmd-shim/test/basic.js b/node_modules/cmd-shim/test/basic.js
index 3cb42347d33ad..09823158b865a 100755
--- a/node_modules/cmd-shim/test/basic.js
+++ b/node_modules/cmd-shim/test/basic.js
@@ -15,7 +15,7 @@ test('no shebang', function (t) {
     t.equal(fs.readFileSync(to, 'utf8'),
             "\"$basedir/from.exe\"   \"$@\"\nexit $?\n")
     t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
-            "\"%~dp0\\from.exe\"   %*\r\n")
+            "@\"%~dp0\\from.exe\"   %*\r\n")
     t.end()
   })
 })
@@ -31,7 +31,7 @@ test('env shebang', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh"+
-            "\nbasedir=`dirname \"$0\"`"+
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")"+
             "\n"+
             "\ncase `uname` in"+
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
@@ -69,7 +69,7 @@ test('env shebang with args', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh"+
-            "\nbasedir=`dirname \"$0\"`"+
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")"+
             "\n"+
             "\ncase `uname` in"+
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
@@ -107,7 +107,7 @@ test('explicit shebang', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh" +
-            "\nbasedir=`dirname \"$0\"`" +
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
@@ -146,7 +146,7 @@ test('explicit shebang with args', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh" +
-            "\nbasedir=`dirname \"$0\"`" +
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
diff --git a/package.json b/package.json
index f81c8d7913f73..d2443b5d5a220 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "archy": "~1.0.0",
     "async-some": "~1.0.2",
     "chownr": "~1.0.1",
-    "cmd-shim": "~2.0.1",
+    "cmd-shim": "~2.0.2",
     "columnify": "~1.5.4",
     "config-chain": "~1.1.10",
     "dezalgo": "~1.0.3",